merge trunk
authorKenichi Handa <handa@etlken>
Mon, 10 May 2010 04:14:21 +0000 (13:14 +0900)
committerKenichi Handa <handa@etlken>
Mon, 10 May 2010 04:14:21 +0000 (13:14 +0900)

Trivial merge